Updated unit tests, still - storing and restoring of objects is not done