Test and documentation updates.

Nothing very interesting here... Devs should verify that the tests still work, but otherwise, these aren't very high-impact changes.

MMavipc: Go ahead and merge it in if everything checks out. :)