Added query unit tests
Added aggregate query unit tests
Fixed a spacing typo