Finished test data generator
Merge remote-tracking branch 'origin/master'
Minor tweaks to the test data generator