Make sure any tests that can use util.js are using it, to reduce the number of tests relying on requireUncached.