NXP-14664 Leverage refactoring + add tests