Ported a few master command tests