Added tests for Util classes