fixup! Fix test infrastructure.