Refactor Cucumber tests, factories and write User tests