Doc, tests and methods updated