Add more location tests