improvements:
- imports optimized
- Stub used instead of Mock
- code formatted