Fixed tests.

Here's the fixes that Grant and I did.