Fail test

* The name is not dynamic
Test pass

* Name is dynamic
Refactor

* Remove duplication
Merge branch 'feature/customer-requirements'