Some suggested changes

Updated some text and grouped test setup.