Update the step definitions based on feedback.

@gjvis