Should, but as you can see I only took part of code and moved it to other class to gather all mocks in one place.

It's not part of this jira task. I think we should create bug for someone to fix it.