Setup refactor + Cucumber update