reworking of doc and test files