Add serialize tests
Simplify constructor