Fixes for unit tests.