Cut on the number of test failures due to bad paths after moving directories
Fix more test failures