adding abbreviated cities functionality and tests for it