Added unit tests
fixed unit test
Merge branch 'patch-1'