Better *Factory test case, doc and implementation.