adding some unit tests
adding some unit tests
Merge branch 'adding_tests'