Get current tests to pass
Merge branch '920374-enter-location' of github.com:caktus/mozillians into 920374-enter-location