Pull mwait into test branch