Touch up failing Preference test, copyright headers, imports