Try harder to avoid Firefox onbeforeunload bug
Make CSV-upload tests more resilient
Typo fix