Improving tests for Visit and Location