Refactoring
Unit / Integegration test with mocking