Fixing up tests related to #SB-188