Better fix for deprecation of Enumerator.new.
Adjust test targets. [admin]