Set indices correctly for rules;
Change the way token matches are tested in split tests (seemingly broken at the moment);