New tests: metadata dict and content
Radical refactoring