fix tests with the correct permission names
Merge remote-tracking branch 'upsteam/master'