Self challenge alter
Refactore cucumber