Added QueryObject + test file