Fixes to new unit tests.