A few changes based on PR feedback. Remove unsorted test data and remove unintentional exit at the end of the test.