WIP  Refactor VE headings scenarios

Change-Id: I9bde8431fbc8a2e783043595e4329bc7a64afed7
Merge "WIP  Refactor VE headings scenarios"