Added more location tests
Added more tests