Add the ability to sort the tests and Models by the Underlying