simplify code
NXP-10864: fix tests
NXP-10864: fix tests