Adapt documentation and test-case