Unit tests refactored.
Unit tests are Ok.