Add/rename tests, add X server CPU usage