Added tests for or and not