fixed tests with error and adding tests for new Or Query feature