Add helper to cucumber and refactor tests