query_supervisor configuration and parallel queries support and functionl test refactoring