Changes to make unit tests work again.