the setups for the newly added tests are very wordy, making the intent of the test hard to see. Could the building logic for the necessary perms/supporting perms be pushed into FactoryGirl? That's what it's there for, after all...