Fixed persistence tests.