Mock update

To give some piece of mind when running the tests, I have updated the use of mocks to use double and get rid of the deprecation messages. This is also on top of the PR #2.