Small tests clean-up

Change-Id: I8d12f6e0a7fc7dbf70d7fd885904573481105704