refactor template
cukes pass