severity is not reliable, changes, does not exist, removing from test
Merge branch 'afsin-dre-refactor' into afsin-issue-310