### Before you go
Unless this is a simple fix (typos, bugs with obvious solution), please open an issue first so that
we can discuss the best approach to address the problem. Without a reference issue and discussion, 
unfortunately, this PR will likely be ignored.

If the edited files were covered by tests, updated tests are required for merging. 
Please look into the tests folders and make sure you cover new code.

- Fixes: ... (*issue number*)
- Tests: ... (*yes/no*)
- Docs updated: ... (*yes/no*)

### Solution
If applicable, describe briefly how the issue was addressed.
