Don't include empty staffDef in test files (rendering should be unaffected)
Merge branch 'concordance'

* concordance:
  Don't include empty staffDef in test files (rendering should be unaffected)