change criteria in delivery service provider unit tests to find correct order reliably