[ENH][FIX] SUnit2 compatibility changes