Fix issues and add test cases for new issues.
Fix issue with interfaces
Patch issue with code rebase.
Merge pull request #64 from charsleysa/metadata

Metadata - Fix issues and create tests