Refinements to taking points off the DataValidator

Not integration tests any more.
![thumbs-up](https://cloud.githubusercontent.com/assets/5978486/4715509/057a8634-58ff-11e4-83af-39d71076721d.png)