Adds helper ordering to tests