Fixed tests and set USE_TZ=False
Added city_state_zip on tests.py
Master merged with outline
Added delimited and listed functions to entry