Add Unit tests for different type of query clauses