Fix test suite, again