Some tests fixed for running on a X11-free server