Fix test suite again