DO NOT MERGE Modifying and adding to Sherry's BT testcases.

Change-Id: I64d301dc6ab56ed2fcef54688647c085bf45dda5
(cherry picked from commit 51153e464e9dcb0794e78293a48d708c603ede15)
(cherry picked from commit 85ba087c0089d8e6077190c844cb5a77cccd3f0f)
1 file changed