fixed end2end test regarding -T and version queries
re-disabled pending (end2end coverage not production-grade)