Unit tests fix
PropertyPersister integration #AM-84 state Doing