Merge "Do cleanup before/after running the test" into rvc-dev