Simplify tests.
Modify metadata.