Added City resource and tests