Merge "Refactoring and mocking to make sure unit test doesn't call the real service"