am 5b13ed3c: Update old tests so they compile and run

Merge commit '5b13ed3cd9373fc384fdce2d1c358dad61128954' into eclair-mr2

* commit '5b13ed3cd9373fc384fdce2d1c358dad61128954':
  Update old tests so they compile and run