Test fixes

@rev lhong@
@bug W-2419593@
Merging origin/tbliss/master-pending-testfixes into master