Modify Util library to utilize pimp-my-library pattern.
Refactored Util class; was erroneously written.
Fix test to map to latest concrete.