Get the last few tests working.

Now all tests pass!