Merge "Add a function to construct the GRSurface in test"