am a0d4d80f: DO NOT MERGE Cleaned up BT test utils

* commit 'a0d4d80fd2feaa04cb5f5242acd159cd783b25d4':
  DO NOT MERGE Cleaned up BT test utils