UPDATE: Unit test fixes for SS3