Merged Manfred's test scripts and updates to the json module.
merging the tip of JED's branch 'test' into Mh's branch 'patches'