Fix nondeterministic test ordering bug.

Fix a unit test bug. Fix was in rackerlabs repo, but somehow never
made it to stackforge.

Change-Id: Ie8a056e553f7385b335771ede1de1c2a8c01ae7a