Doc updated and tests fixed
Doc updated