Updated json metadata parser, now passes with a full sample metadata document.  Required tweaks to metadata schema which broke other tests.