Code cleanup
Mocked reuests call in test