started working on unit tests
Merge pull request #34 from SlavD/develop

started working on unit tests