Fix some of the testthat syntax and sort the columns.