add blanket test coverage support plus some additional tests to get better coverage