Modify tests to use containsInAnyOrder() rather than contains()