- fix a bunch of test failures