Minor tweaks to product json creation.  Completed tests for json creation