Fixed the hazard QA tests
Fixed the risk QA tests