Implemented DataFactoryWrapper methods and tests.