@limited-terabyte-34878: @cuddly-architect-27013 is working on improving test coverage support for junit, so he'll be refactoring a bit in there as well