Fixed ClassNotFound exception while restoring state. Added SaverTest.

you have erased formatting by layouting code, please correct