Factory tests updated