Added unit tests
Merge branch 'test'