Multiple updates to get implement Pundit and rework tests for the change.