Make regression test suite work