small fixes to make the vanilla tests work again on master