fixed broken tests caused by conflicting folders
Merge pull request #1084 from crate/h/testfixes

fixed test