Added unit tests
1.0.7