Fix compilation warning
Refactor Query tests
Remove useless build() method from Query fluent API