CAAERS-7008, Fix some order sensitive unit test to be more reliable.