Update tests for new Choreographer implementation.

Change-Id: I71faf70430f44d7b94a01609cfffb1b1913a61f0
1 file changed