fixed unit tests
Merge branch '2.5' into 2.6

* 2.5:
  fixed unit tests