Finally fix the running of tests.