Issue #3439914 by pradhumanjain2311, sukr_s, vensires, smustgrave: Fix User tests that rely on UID1's super user behavior
