Fix a few more tests.
Change to make it easier to understand what's actually going on.