Fix failing PersistenceMethodTests