* add mocks * review changes * fix tests * review changes * review changes * review Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>