Fixes test_serialize_compatibility

- Increases timeout in test_serialize_compatability
Merge pull request #2212 from lukecampbell/fixes

Fixes test_serialize_compatibility