Automation fixes, 3 new BVT Tests, 1 new Deployment Test

Committing after resolving conflicts..