[HELIX-243] Fix failing tests related to helix model overhaul
[HELIX-234] Convert-all-Id.x-to-x.from-and-assorted-code-cleanup
[HELIX-234] Convert-all-Id.x-to-x.from-and-assorted-code-cleanup. add a missing file