Returning to AND condition for SL failure rather than OR
Commenting tests which break with validation

To be uncommented when we implement TP #1105 properly