Merge pull request #553 from e-cuellar/master

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