Get tests passing on beta.

Some tests needed some extra resiliency.
2 tests were disabled and will be reenabled when their bugs are fixed.

Change-Id: Ic285a4e5442f75643be146fc87b7ed0e29d68410