Small fixes for unit tests.