Added testing for locations route, fixed bugs