fix part of the test suite