Test; Created and updated tests.
Refactoring;