fix tests!
Merge branch 'master' into hotfix/cache-irritation