Fix dispute test failures