Fixed two of the tests.