- fix test failures
