Fix two failing tests.