Updating unit tests to reflect the removal of the factory interface