Merge "Remove the need for permission during tests" into main