Final set of fixes for testing getRequiredDirectories