[WIP] Test refactoring

Change-Id: I242eb8a056b6022c4197caeca220a96d726e63b3