CUnit testing clean up
Merge pull request #47 from nilopc/sifo3-beta

Unit testing clean up