applied corrections to allow run all test modules