Mvexpand done and add test