fix test suite failures