Updated control structure for tests