Reraise metadata parse error as MetadataValueError
Clean up metadata tests a bit