Parameters parsing refactored to its own class
Tests: extended and updated