Fixes for unit test to work again.