Complete tests
Merge pull request #23 from kotlinski/fix/complete-tests

Complete tests