Converted city and dun to lua classes
Added some tests