Adding tests
Migration to HUnit over