TST/BUG: fix failing data.py tests for good

closes #4028, #3982. for good.