Consolidated Major Refactoring of Test Suite