5022 fix tests