Merge branch 'jk/completion-tests'