Fixed test case
Changed joinWith(And|Or) appends round-brackets automatically and to(And|Or)ConditionOpt won't always append round-brackets