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