- Minor cleanup
Start using OUnit package for Unit tests suits