Editing the factory and basic unit test calls