Added more tests for City and User, code coverage at 75%. Woo!