- Broke out Dataset into Query and Dataset.
- Test spec.