DO NOT MERGE Cleaned up BT test utils

Change-Id: I905a468a04b5730258a9e6525165e4c4013d30c8
1 file changed