Fixing test directory structure again