Merge branch 'jc/test-must-be-empty'