Merge "Fixed the make file for location tests"