Add expectations and other suggestions from @alco