Persistence.connect/disconnect and tests simplified