Fixing location tests