* Update a bunch of the unit tests to either be disabled (someone who
isn't me and knows that code needs to fix them) or to work properly
This commit was SVN r4986.
This commit was SVN r4978.
The following SVN revisions from the original message are invalid or
inconsistent and therefore were not cross-referenced:
r4977
