Fix the tests after merging the 1.4 branch