Added some more tests for locations