Expand util tests