Merge "split out the simpler parts of ConditionTest"