TRUNK-4436: Improve the order service test and use nullSafeEquals