Merge "Fix handling of tests for variants."