wip TestKit refactoring
wip