Fixed tests
Merge branch '1.4' into 3.0