Increase unit test coverage

[sgnn7]

There's a lot of unit tests in the repository but increasing coverage to cover all main usages is needed

Describe the solution you would like

• [ ] We have unit test code coverage over all logic used in most common scenarios

Connected to #35