Few changes.
- Fix all tests.
- Pass all tests.