tests, docs extended