Update these with the factory method too? We should be testing using the code paths future developers will use :)