queryservice_test revamp test_env getting better
queryservice_test: merged TestEnv classes into one