Prune apparently obsolete comment
Fix user tests