Merged Manfred's test scripts and updates to the json module.