Minor changes to how test files and test support files are loaded