Changes to Factory creation based on unittest refinement.