Changed the serializer to use RollupEmission, changes tests