More conversions and tests between protocol <-> model