[CDF-410] - Improving solution, reintroducing PersistenceTest