setting up some unit tests
Merge remote-tracking branch 'origin/master'
more unit testing