Fix Mobile CLI tests and rerecord