removed unused imports, fixed tests, refactored mocks and request objects

In this pull request I removed unused imports, fixed tests, removed one test, and refactored mocks and request objects.