Updated Condition unit tests