Break up test to focus on different scenarios.

+review REVIEW-5071
Remove some text from spec that was mistakenly there.