Merge "Improve location package test coverage" into sc-dev