Switched to proper HUnit tests