Fix unit tests
Merge branch '3.7'