Folder docs, more tests, single folder lookup