Refactored features, step defs, and page classes