Merge "Refactor test sensor management."