added a bunch of tests and covers annotations
Merge pull request #417 from digitalkaoz/tests

increase test coverage report