Add tests for locations vocabulary
Use more general term 'location' instead of 'city'