Merge "Add missing Condition tests"