Adding persistance tests