whitespace cleanup
include more rollup types in serialization tests.