NXP-14448: Fix a unit test, add another