Fix factories
Remove obsolete test