returning factory instances directly instead of the factory methods; changed specs to expect that a factory instance is returned.