am 7798d36a: am d2f813c3: Merge change I60cfe9ce into eclair-mr2

Merge commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8'

* commit '7798d36a4661ac8c88eb47cf0c66d3eeafb2f7a8':
  Add unit tests.