Doc and tests updated