Test more OC steps

Change-Id: I8da7ad06e6fc5a2ddcc1ab14832ca296aa933b94