7.x fix tests