reworked test suite for HUnit