Fix test suite...