Fix some features for cucumber tests