Closes #3158916
I tried to keep the scope for this one small, we should open a follow up for converting the rest of the LB tests to use the new trait.