Updates for persistence service exception handling and tests