Break tests into smaller chunks

This doesn't have a huge effect right now, but sets the stage for testing
features more atomically (like the stream errors being added next).
Normalize comment style