Remove extra mock
Add support for user-added serialization