Continued adding HUnit tests