Removed test query gen