Restored cucumber tests as opt-in only; rake still is only rspec