Continue fixing specs to support QueryProxy class