NXP-10864: fix tests
Merge branch 'master' into NXP-4803-db-uuid