separate mockquery into its own package