Fix up final tests

Okay! All of the tests are good now.