Added persistence tests