Merge pull request #83 from r-world-devs/maciekbanas/81/prepare-mocks…

Merge pull request #83 from r-world-devs/maciekbanas/81/prepare-mocks… #92