rpearce/mshah: Use headers global variable, don't pass it to data

   * Fix merge conflict
   * Rename fixtures
   * Add new test for default script output