[HELIX-243] Fix failing tests related to helix model overhaul