Improve robustness of bok choy discussion tests

A test failed because an element disappeared between the evaluation of
the clauses of a conjunction, so rewrite to make the conjunction
unnecessary.