Fix should to be 2.0.x
Fix test for breaking change in should 2.0.x (fix #1013)