Improve test of retrieved data