- Fixed unit tests.
- Improved code.