Cleanup of test steps

According to Željko's suggestions

Change-Id: I31569adf9af02ffc5ec71d04e69b74e0f1843416