Some changes related to the latest version of TestFactory