removed unecessary testing class, fixing query retrieval