Work on ITest-2 Failures:
 - More work around 1071330, use new local SLSBs as needed in test code