fixed unit tests
Merge branch '3.4'