Refactoring of StarWarsDataProvider + unit test