re-organizing the factory small testing changes