Fixed tests after changes for long serialization support