Fix two issues with unit tests.