Adjusting metadata-related tests