Move a few more test files around.