Updating tests to adhere to changes for Factory Design pattern