Testrunner: Refactor to remove duplication of variant types

Test: manual
Change-Id: I048d927ca8c9a6beeecdfb4586ead82ac765468c
1 file changed