Added saving capabilities for surface testing