PSR-2 fix
Extended query test coverage