Issue #1962358 by grom358: More test fixes
Issue #1962358 by grom358: Fixed TokenUserTestCase