Fix maillist and user tests, some indentation too