Tried running the tests, so I had to fix a few things
Merge pull request #50 from obshtestvo/adamov/fix-tests

Tried running the tests, so I had to fix a few things