Merge "Explicitly require root privs for tests requiring it"