Fix tests and make it all green

[ramereth]

Description

Describe what this change achieves

Issues Resolved

List any existing issues this PR resolves

Check List

• [ ] All tests pass. See TESTING.md for details.
• [ ] New functionality includes testing.
• [ ] New functionality has been documented in the README if applicable.