* Removed obsolete code.
* Refactor tests.