Persist and Test

Signed-off-by: Sara Hemati <sarah.hematii@gmail.com>