Reworking test framework to allow for proper usage of coverage