[PMD-987] Fixed metadata import and broken unit test
Merge pull request #554 from e-cuellar/5.2

[PMD-987] Fixed metadata import and broken unit test