Corrected surface, also added some tests for surface and geometry, printing points