tests
Merge pull request #2548 from mruz/2.0.0_fixes

2.0.0 fixes