Make unit tests work again