Updated testing dependencies
Merge branch '4.0'