added a few more tests, removed dead code, thanks to code coverage tool