Adds and completes some city tests