Fix recursive directory file completion
Fix tests