Improve arbitrary order warnings
Unify collection clear in tests