Renamed upctest-pil to upcean-pil and upctest-cairo to upcean-cairo.