Merge branch 'fc/completion-tests'