Adding logic to disable/enable Cascading tests