Better testing for persistence; IE shape compatibility @dragos.oprescu