Fix several failing tests.