Clean up util_test.go source file