re-enable commented out tests
@bug W-2102747@
@rev mkohanfars@later

added waitfor statements
Merging origin/ctatlah/master-pending-reenabletests into master