rm merge detritus
break up big blocks of test in enumerable_test into single assert tests

note: this doesn't fix the build, but it does more clearly pinpoint the problematic cases