fix tests!
Merge branch 'master' into hotfix/design-fix-1
Merge branch 'hotfix/design-fix-1' of github.com:adapt/ashtag into hotfix/design-fix-1