Tidy up some uses of test macros.

Change-Id: Ifbe3200923b060feecdd33a3bc1be375e98d8df7
Reviewed-on: https://code-review.googlesource.com/2870
Reviewed-by: Paul Wankadia <junyer@google.com>
3 files changed