#77 : Refactor persistence classes to follow new standard correct corresponding form
CS
#77 : fix test