Merge change I60cfe9ce into eclair-mr2

* changes:
  Add unit tests.