add new acceptance criteria
Refactoring and add a more easy scenario to run tests