Fixed the risk validation tests (again)