Unified location for files necessary to run the test suite
Changed paths in the test suite to match last commit changes