Consolidate SAD tests.
am: 2c029f35ee

Change-Id: Ifbe7ddf2af7a2f804f24c5bb1368913b59e3c378