better handling of images in surface, extra test files