added more Conditional tests