Added additional unit tests for query builders