Some more test cases added reflecting Viva Qs
Merge remote-tracking branch 'origin/master'