added delete user from city; refactored test file

Still has commented-out code that needs to be finished: removing the city when the last user is removed. Deleting a user from the city works and passes tests.