Rearrange settings tests