Fixed sortby tests to pass