Documenting cairo bump
Fix unit test for stubbing out ImageSurface