adding fixes for test-metadata build fail
Merge pull request #35 from thushara35/master

Adding fixes for test-metadata build fail