[FIX] Tests after rebase of reg_cocktails

[ravinkohli]

Types of changes

• Bug fix (non-breaking change which fixes an issue)

Note that a Pull Request should only contain one of refactoring, new features or documentation changes.
Please separate these changes and send us individual PRs for each.
For more information on how to create a good pull request, please refer to The anatomy of a perfect pull request.

Checklist:

• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation accordingly.

• Have you checked to ensure there aren't other open Pull Requests for the same update/change?
• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your core changes, as applicable?
• Have you successfully ran tests with your changes locally?

Description

This PR resolves the leftover conflicts following the rebase of reg_cocktails with development. It also fixes the failing tests and resolves other incompatibilities between the refactor_development_regularization_cocktails and `development.

Motivation and Context

It solves the bugs in reg_cocktails so it can pass its checks.

How has this been tested?

Not relevant as no new feature has been added.

[codecov]

Codecov Report

❗ No coverage uploaded for pull request base (reg_cocktails@87ee242). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             reg_cocktails     #359   +/-   ##
================================================
  Coverage                 ?   81.48%           
================================================
  Files                    ?      164           
  Lines                    ?     9917           
  Branches                 ?     1759           
================================================
  Hits                     ?     8081           
  Misses                   ?     1294           
  Partials                 ?      542           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 87ee242...bc535dc. Read the comment docs.