Merge "Location Unit tests"