added some tests
Merge pull request #2 from Arrnas/added_tests

Code not covered by tests