Lots of unit tests
Updated scripts
Merge branch 'hotfix/DOM-46'