Changes From UnitTest++ to normal testing flow