Test more OC steps

Change-Id: I8da7ad06e6fc5a2ddcc1ab14832ca296aa933b94
Test

Change-Id: Id6cd28a71508d045cbcedd652a792a907cf3a436