Merge "properly setup/teardown the test" into oc-dev
am: c18bfa2dce

Change-Id: I8840999cdee99d339c7b90b3e92a420812f07eed