Adjust tests for deserialization