Added a Util class with full test coverage.