test for subdir contents, properly this time
Merge branch 'feature/subdir-tests' into haf-fork