Merge "Fix resize tests"