Metadata Bug Fixes
Adds coverage tests to fix
Merge pull request #81 from sudorandom/issue_80

Metadata Bug Fixes