Refactor

1 Mac test over

Change-Id: I62758d959b0a6adc0ead7fe4cead78506ccc2790