Fix TRIB-95 and TRIB-96 maintain reverse chronological order

remove unused test data

Order before paginating