Improve tests / fix serialization.
Add golden files.