Update SavepointTestCase.java

Removed surplus flatten functionality for actual data set, plus clean up.