Conditions tests updated