Tests and drivers updated, still need to shuffle dirs. llvm-svn: 67602
Note that there are still other issues in this area; see PR3396. llvm-svn: 62942