sub-sub dirs is a good idea, the other test I'll add when resolving #1755