Make tests work again.