Reorganise tests