Implement more test steps

Change-Id: I1c10201138f2fb5a8d4aef2ce6b510b7ab0d9aec
Merge "Implement more test steps"