NOJIRA Get tests working enough so ControllerSecurityTest passes