The serializer tests occasionally fail since the order of a dict() is not guaranteed. Explicitly compute the serializer instead of pre-computing it. Change-Id: I74f8fa227e6508491b5982fe7e2841683724540c