Rename test util files so that they don't get compiled in with the library