UnitTest++ is now used for testing; minor refactoring