Update affected module following review of util.py and test_util.py.