Actually return data.
Add test for json data.
Merge pull request #730 from NatTuck/data-set-has-data

Actually return data.