Fix missing Then keywords in cucumber features
Improve wording in sh cucumber feature