Extract QueryBuilder related methods from TestTsdbQuery
Update tests for QueryBuilder to set required parameters