Fix final failing tests.