Merge branch 'jk/test-fixes'