Refactor test case a little bit
Implement deserialization
Adjust builder mechanism to support serialization
Implement deserialization