Improved Query::__construct
Update Test Suite