Added more query operators and tests