Reorganize test splits again (#267)