Follow-up to fix running of tests.