NXP-12147: trying to fix tests