Removed dependency to mock server