- removed use of Factory in testsuite