Removed currently unneeded test directory nesting.