NXP-14069: Fix JUnit tests