Phew! Finally got all tests cleaned up a bit.
Cleanup filenames now that they've changed.