Refactored QA tests risk
Some renaming