Location fix

The new Location should always contain an _image field.

Fixes for tests from changes to Location.