Fix some edgecase test issues

Fixing the failure of some tests if the framework dir is named something other than 'framework' (which is a legitimate option)