Refactoring of DataDocumentationMethod and add some unit tests