Use a backwards compatible name for Enumerator.
Actually fix tests for Enumerator/Enumerable for both 1.8 and 1.9