Fix tests.
Improve data.json harvest - more tests & error handling