Reoranganise test files.