Fix two unit tests.