TEMP Testing simplification of factory