Persistance
Fixed persistance bug
Test case for persistance