Fixed issues with OR. Made tests for OR