WithInnerCollectionLikeness + tests
Refactoring
Refactoring + missing files