Get rid of boilerplate comments
Change test wording to match other tests