Try to fix error in tests
Try to fix error in tests (2)
Try to fix error in tests (3)
Merge pull request #92 from bevalorous/master

Fix errors in tests and make the biuld to be green