Merge "Fixes and additions to VDM unit tests" into main