Split task, improve configuration, add tests