Fix & test factory.deep and factory.one