Special case for marc metadata. All other metadata working well. Some updates to tests.