- fix test failures and errors
