Unified list-hazard-outputs and list-risk-outputs; fixed a few tests