[change] some more SWB SBD polaytest tweaks