fix tests failing on different JDK due to different Collection ordering

(also removes obsolete comments)