fixing location determination, more tests