Clean-up stay char and EOD on nodriver test