[rhq-project/rhq] 256b34: Update test code to be more flexible in test arti...