2.2.x fix tests