Fix in test suite