Added tests for the or condition