Started fixing Util tests. #8