Improve tests to ensure backward compatibility

[sagikazarmark]

Preflight Checklist

• I have searched the issue tracker for an issue that matches the one I want to file, without success.

Problem Description

The current tests are rather poorly written with a lot of mocking.

Proposed Solution

Adds some more functional tests to make sure backward compatibility is kept.

Alternatives Considered

No response

Additional Information

No response