Make splittests independent of persistence