Some test clean-up

Change-Id: I620c6cddf99981680317f26000b78c9260b7c596