TST: fix failing data.py tests FOR GOOD

closes #4028, #3982