Fix broken tests.
Merge branch 'hotfix/fix-broken-tests'