Added a default constructor
Improved code coverage
Unified method signatures between utility classes