More doc and tests