updated tests to check directory structure is respected