simple fix for directory contents test
minor fixes to tests to account for new filesystem organization
Merge remote-tracking branch 'origin/next' into next