Fixing Util.h. Added Unit tests