Merge branch 'fc/completion-test-simplification' into next