fix the execution errors on tests (not test failures), plus any associated code changes