Update tests for new location mapping