@polesye You are right, lets refactor the tests in another PR.