Merge change Idc3d3b2f into eclair

* changes:
  Moved the test data to their own package.