some test fixes
some fixes
Merge branch '2.2' into 3.0