BUGFIX: Fix unit tests after SS 3.1 upgrade