Reorganised test directory