Try to fix remaining failing test.