Reorder and add comments to settings test