Merge branch 'fix-tests' into ci