Improved mocking.
resolving merge issue