Refactoring, deserialization test