fix features, pass most cucumber tests