Tweak existing tests to work again