Add tests for City
Add tests for Wallet