Add fixes to Enumerable
Complete testcase