[#1164160] Refactoring cucumber tests