#102 implemented more tests, increased code coverage