[HELIX-109] Review Helix model package, fix failing tests