Making unit tests work again.