renamed unittest to unit_test to avoid confusion with module 'unittest'
Merge branch 'master' of https://github.com/trobert2/unittest_repo