Updated tests to pass with the redesigned MetaData import