Lots of uncovered test code covered