Merge branch 'jk/test-framework-updates'