- Fixed integration tests.
- Refactored code.