NXP-15246: Adapt unit tests