Fixed some tests
rm QueryBuilder.php
Fix some superfluous brackets
Remove more superfluous brackets
Remove yet more redundant brackets