Fix bug with test sets ordering on ui

Change-Id: I1396c6dc2d2221a73a4d22a0fde4b124797a350f
Merge "Fix bug with test sets ordering on ui"