Fix various "require"d libraries for test.
Rename test files.