Doc updated
Tests updated