HCOLL-213 Add persistence to the test