Merge branch 'fix-tests'