Updated all tests to reflect the persistence tests