RE: [FIX] Some SUnit Test fixes to 3.8