Refactor cucumber test

If you are going to comment things out, I think it is better to keep this file unchanged.