Tests for Util.java added