feature: refactoring and tests to get every started as expected