Fix integration tests

We should change everywhere from asserting that they are serializable. They only need to be xstream-serializable, which does not require `implements Serializable`. Also, the xstream serializer has some special hooks that replaces an entity reference with a marker for that entity, etc.