NOJIRA Fix test errors to the point where ControllerSecurityTest runs