Merge "Testrunner: Take default only when no other variant is selected"