Cleaned up Tester, added functions to Affix