support for coverage and some more test cases