fix typo

Cherry-picking 04001621513ee3
add DisjunctionTest

Cherry-picking 77a4e97e79129cbb1
fix issue where x would be evaluated twice.

same issue #352

cherry-picking df37a98b51b6c
fix issue where x would be evaluated twice.

same issue #352

cherry-picking 871a35f0ead9d96