Improved code coverage
Removed Uuid class