Updates to test, serialization