iModified UnitTestBuilder to fix an issue