Adding tests for condition class
Fixing method signature on query class