Merge "Add conditional business logic test type"