add CreateHeartbeat and Heartbeat.Marshal, plus add them to tests