Copied TestObjectFactory to a more convenient place.
Added reworked test outline.