Updated tests for City