Updated control out of test logic