Changed test files directory structure