Fixing the failure of some tests if the framework dir is named something other than 'framework' (which is a legitimate option)
Merge pull request #3461 from NightJar/testfix

Fix some edgecase test issues