Restructured testing framework to make it parallel the mini-module framework used in the main portion of the module