Fixed all risklib tests