Issue #19 Persistence tests fixed