updated unit tests fixes #12
Merge branch 'testupdate'