Merge "Improvements on test case setup." into nyc-dev
am: 7b3ee10

* commit '7b3ee108ce80c23f99fc5120a762ac93ad8e708a':
  Improvements on test case setup.

Change-Id: I945cd721b3983d0be4b66af74f1c0cfd284ddfe9
tree: 8cb3628b5596ad40660e63586d7b98d9be915ff6
  1. tests/