Merge the two existing test directories into a single, consistent layout.
Merge the two existing test directories into a single, consistent layout.