Refactor test sensor management.

Change-Id: Id9f751066908827bf311189c629d37f30d6caf4d
7 files changed