Added tests for location