Fixed test on Java 6 (Collections.emptyIterator is since 1.7), improved test
Fixed test on Java 5