AIS test update part2
@rev gtorres@
@bug W-2348095@
https://code-collab.soma.salesforce.com/go?page=ReviewDisplay&reviewid=652412
Merging origin/lin/master-pending/ais-test-part2 into master