Make equality check in system test order independent

Change-Id: Ib5162041501b834ac17295901f4a5329b7f1d4fa