Tests works.
Refactoring.
Working on unittests.
Working on tests.