order scope hash syntax
tests refactoring
Merge branch 'hotfix/review_fixes'
Merge tag 'review_fixes' into develop

review fixes