MikhailNavitski

Hi @davidjgonzalez I've created a PR with a partial fix, Can you review it? Thanks

> Why adding a new dependency without changing any code? What does this fix? Currently, there are several open issues related to the unit tests that I am planning to...

But It seems like need to rewrite a ton of tests for it :)