changes for the managment bvt tests
Merged Conflicts
Merge pull request #2634 from amarzavery/dev

changes for the managment bvt tests