fix up tests after some api changes today