make test context aware of browser type
@bug W-1370858@
@rev gtorres@
Merging origin/lin/master-pending/testContextPerBrowser into master