New metadata files and tests