Dynamic metadata initial commit
Updating tests
Updating tests again