Adding structure for test execution