Rename test files.
Swap out some modules.