Increase wait times to improve robustness of some integration/feature specs

Also try to unify some spec style w.r.t expect vs. should, func(args) vs func args, and :key => value vs key: value