NXP-10039: Fix test
NXP-9590: Add missing versioning tests