Cleanup in action tests

Change-Id: I69b8fd3f2c92165467277c3853d2d133d3aae085
Merge "Cleanup in action tests"