Folders follow up

Initial follow-up, still some pending
`expected entities` and same comments as above