Own factory is handled when resolving Enumerable
Merge branch 'master'
Additional tests