reduce complexity of Test execution

Reduce number of conditions in test execution.