Change tests and forms according to new PersonalSettings module