Merge "Testrunner: Refactor to remove duplication of variant types"