Changed test file tree structure.