Fix some failing tests.