Issue #2827100 by DamienMcKenna, rivimey, joelpittet, TR: Partial Revert of uuid in Improve test coverage and function docs