6f17a97 Better *Factory test case, doc and implementation.