Merge branch 'test-fixes'