Added Query Helper unit tests