Minor refactoring regarding code review
Rewrite the test with cucumber