Merge pull request #14 from derek63/master

Fix metadata unit tests