Tweak timing of index increment, update tests