Fixed factory name and tests.