Merge pull request #173 from vnitinv/unit-tests

Unit tests