Add specs for map in locations controller. Move a couple things in the location and user controller