Improving persistance test