Move two multi-module tests into their own directories and make them
proper multi-module tests rather than ordered single-module tests.
The previous hack broke down when the profiling way was added.