Fix to test framework setup scripts