Fix tests.
Merge branch 'concaternation'

* concaternation:
  Fix tests.