Tests prototype for the Serializer

+a few layout fixes