Updated tests due to change of behavior WRT location content.