this should make the tests for UW pass more consistently

Change-Id: I6e0f9532b5ed7c60b76987df8e2079f5e624c23c
Merge "this should make the tests for UW pass more consistently"