Rename tests, clean up comments.