Permissions edits, and a small handful of tests