more coverage and test refactor

just some tweaks to the tests
in the form of a refactor and
added test case