Added tests for conjunction/disjunction