Fix test ordering to match what bundletester actually does