Merge pull request #2881 from niden/2.0.0

Test corrections