renamed unit test classes
added support for non-final affix templates