Fix location tests
Merge remote-tracking branch 'origin/red_to_green_tests'
fix tests