Fixed metadata tests to reflect the changes