test suite based fixes