Merge "Fix test break due to API not working as advertised." into lmp-sprout-dev