Add more test steps

Mostly by Runa

Change-Id: I2a7403cd8baf3d16b6f07d6021f8f6f0d0c28620
Merge "Add more test steps"