TST: more data.py cleanup
Merge pull request #4085 from cpcloud/data-dot-py-cleanup

ENH: really really really fix the failing data.py tests