Made test name more obviously reflect directory structure.
Merge branch 'feature/improved-test-name'