Fixes for changes in the way tests are run