add test templates for cosmetic and lamp-post generation in town.  clean
up generator class (remove extra class)