Changes related to the update to the 5.1 version of TestFactory.