new spec base on refactor code

Change-Id: I9d3702801cf2dde63a218255c61869678683e1cd