Refactored RiskInput objects
Fixed scenario_damage_test.py