Refactoring of the unit tests for better understanding and organization