Organise test files