Merge pull request #19 from iamshital/master

Automation fixes, 3 new BVT Tests, 1 new Deployment Test
Fix XML format.
Merge pull request #20 from AbelHu/master

Fix XML format.