fix test failures (tests require updating though)