Basic hacky fixtures for rev1
Separate out serialization logic a bit