Merge branch 'rj/test-fixes'