Extract util_test.go files to zaptest