Fix test with new workflow.
Fix more tests.