Fixed some risk tests