Update metadata
Add tests