NXP-11286 Add missing dependencies and fix tests