Fixing small error in the unit tests
Merge branch '3.4'