Fixed qa_tests/risk
Fixed again qatest-1
Merge branch 'restore-qatest-1' into removing-ruptures-2