Fix tests.

Tests are green now.