Implemented and tested test-entry reordering.