NXP-14114 Tests + small cleanup