Fix a broken test and add an additional test for preserving directory structure on file glob