Fixing unit tests to work again.