NXP-11094 test cleanup