More cucumber fixes
More cucumber fixes

selenetelenav/spork,Eric-Guo/spork,sporkrb/spork,Eric-Guo/spork,chrismdp/spork,jarmo/spork,selenetelenav/spork,jarmo/spork,paypronl/spork,paypronl/spork,sporkrb/spork