test refactoring

Change-Id: I6c0d599941c7829765b53be0c5a2077c8e03e1e4
17 files changed